Merge akbargumbira:master to AIFDR:master

Note: akbargumbira:master is identical with AIFDR:develop