Merge changes I8fd2a3c9,Id08058f3

* changes:
  Set apex_available property
  Set apex_available property