LA-15: Null placeholders not used for saving associations (#15)
Merge remote-tracking branch 'origin'